Skip to content

chore: cherry-pick upstream sync (1 commit)#16

Open
prospapledge88 wants to merge 1 commit intodevfrom
chore/cherry-pick-upstream-sync-2026-05-07
Open

chore: cherry-pick upstream sync (1 commit)#16
prospapledge88 wants to merge 1 commit intodevfrom
chore/cherry-pick-upstream-sync-2026-05-07

Conversation

@prospapledge88
Copy link
Copy Markdown
Owner

Upstream sync — 2026-05-07

Scanned 5957c6e2..upstream/dev (59 commits total). Batches 1–8 (sync PRs #6#13) had already absorbed the vast majority. This PR picks the one remaining commit that was missed.


Commits by tier

Tier 1 — Security CVEs / crash fixes (1 commit picked)

Upstream hash Subject
25531df chore(deps): remove stale package-lock.json to clear Dependabot alerts (#1483)

Details: Removes the stale package-lock.json (accidentally re-committed in upstream coleam00#89, not used by Bun) that was triggering 21 Dependabot alerts. Adds package-lock.json / yarn.lock / pnpm-lock.yaml to .gitignore. Adds four explicit CVE override pins to package.json:

Our bun.lock already had the patched versions (absorbed via earlier syncs), but the package.json overrides were missing, so a fresh bun install could have resolved older vulnerable versions.


Tier 2–3 / Skip — All other 58 commits

All bug fixes and reliability improvements from this range were already absorbed in prior sync batches:

Remaining upstream commits are Pi provider, maintainer workflows, Docker-only, Homebrew formula, release commits, and docs — all intentionally skipped per fork policy.


Conflicts resolved

File Resolution
package.json Merged CVE overrides from upstream with fork's existing overrides (test-exclude, @hono/node-server)
bun.lock Used upstream side of conflict (added missing path-scurry and pend entries); bun install then regenerated the lockfile cleanly (the conflict arose because our lockfile already had patched versions from an earlier sync)

Validation results

Check Result
check:bundled ✅ PASS
check:bundled-skill ✅ PASS
type-check ✅ PASS
lint --max-warnings 0 ❌ 28 pre-existing no-unnecessary-type-assertion errors (identical on dev)
format:check ✅ PASS
tests ❌ Pre-existing failures (same as dev): @archon/providers 57 fail (running as root/UID 0, IS_SANDBOX not set), @archon/workflows 2 fail (includes known bun script node does not leak repo .env from execution cwd (#1135)), @archon/core 25 fail (orchestrator tests)

All failures are pre-existing and identical on the dev branch — confirmed by running bun run test and bun run lint on dev before the cherry-pick.


Notes


Generated by Claude Code

coleam00#1483)

* chore(deps): remove stale package-lock.json to clear Dependabot noise

This file was deleted in coleam00#85 (Bun migration) but accidentally re-committed
in coleam00#89 unrelated to that PR's actual fix. It hasn't been touched since
April and isn't used by anything (CI runs `bun install`), but Dependabot
keeps scanning it — every one of the 21 open alerts triaged in coleam00#1353 is
against this file, not bun.lock.

Removing it closes all 21 alerts. The axios `^1.15.0` override in
package.json stays — it's doing real work for the bun tree because
@slack/bolt pulls in a vulnerable axios transitively (CVE-2025-62718).

Add package-lock.json (and yarn/pnpm lockfiles) to .gitignore so this
can't silently slip back in.

Closes coleam00#1353

* chore(deps): patch four runtime CVEs in bun.lock via overrides

Targets coleam00#1353 alerts that resolve in the actual runtime tree (bun.lock),
not just the stale package-lock.json removed in the previous commit.

Added overrides:
- follow-redirects ^1.16.0 — auth-header leak on cross-domain redirect
  (GHSA-r4q5-vmmm-2653); via @slack/bolt
- path-to-regexp ^8.4.2 — DoS via sequential optional groups
  (CVE-2026-4926, CVE-2026-4923); via @slack/bolt + claude-agent-sdk
- qs ^6.15.1 — arrayLimit bypass DoS
  (CVE-2025-15284, CVE-2026-2391); via @slack/bolt
- flatted ^3.4.2 — prototype pollution in parse()
  (CVE-2026-33228); dev-only via eslint chain

bun audit confirms each resolves to a single non-vulnerable version
across the tree. bun run validate green. No code changes — purely
transitive bumps; we don't import any of these directly.

Skipped (require deeper triage): undici, lodash, picomatch — each has
multiple major versions resolved in the bun tree, so a single override
would force-downgrade other consumers.

(cherry picked from commit 25531df)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants